Conversation
|
Thanks for the contribution! Before we can merge this, we need @notdanhan to sign the Salesforce Inc. Contributor License Agreement. |
|
I signed the CLA and the bot crashed? |
| @@ -1,177 +1,179 @@ | |||
| /* | |||
There was a problem hiding this comment.
the clang_format file triggered this noise
| std::string GetFlushRate() const { return GetParameter("--flushRate"); }; | ||
| std::string GetNoColor() const { return GetParameter("--noColor"); }; | ||
| std::string GetNoMerge() const { return GetParameter("--noMerge"); }; | ||
| std::string GetStreamMappings() const { return GetParameter("--streamMappings"); }; |
There was a problem hiding this comment.
the change in this file
p4-fusion/main.cc
Outdated
| PRINT("Excluded paths: " << exclusions.size()); | ||
| if (maxChanges > -1) | ||
| { | ||
| ERR("MaxChanges and StreamMappings cannot be used together! exiting."); |
There was a problem hiding this comment.
Is there a specific reason for this? If this is enabled, you wouldn't be able to clone the depot in batches and instead it will always need to be done in a single shot. This could be a problem, but I guess we don't have anyone asking for batches right now except for Sourcegraph
There was a problem hiding this comment.
I suppose it'll probably work as-is with the max changes stuff since they're sorted in together, I'll have to add extra logic for pruning the vector of ChangeLists at the end, shouldn't take too long to do.
| PRINT("Path: " << mapped.stream2 << " has " << temp.size() << " changes!"); | ||
| changes.insert(changes.end(), std::make_move_iterator(temp.begin()), std::make_move_iterator(temp.end())); | ||
| } | ||
| std::sort(changes.begin(), changes.end()); |
There was a problem hiding this comment.
This is a genius way of sorting CLs coming from different streams. Amazing!
twarit-waikar
left a comment
twarit-waikar
left a comment
There was a problem hiding this comment.
Other than this, some tests for the new STDHelper you added would be great!
Thanks a lot for working on this feature!
There was a problem hiding this comment.
clang format file reformatted the entire file again
|
Merging this. Thanks! |
twarit-waikar
left a comment
twarit-waikar
left a comment
There was a problem hiding this comment.
This needed a minor tweak for the build in #87 but thanks for all this work!
2 participants
this allows you to use Stream view mappings as per the request of
#83
Built and runs on WSL and OpenSuse Tumbleweed